Merge "libhardware: fix gralloc usage bit redefine"