am 15b6cc56: am b4b448a9: am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."

* commit '15b6cc560eccbfe98e9ff3388218b70d2206ce20':
  emulator gralloc: removed compilation warnings.