am f456512f: Merge "libhardware: fix gralloc usage bit redefine"

* commit 'f456512f9e54c534378683d0cd8f288b6312be2b':
  libhardware: fix gralloc usage bit redefine