Merge "Re-add gralloc 1.0 header" am: e7a66b9abc
am: b92b5dea6b

Change-Id: Iaa72cc65f8f90923b6f204cc11befc2a089075cf