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

Change-Id: I78acb8c9e3ab9f2e7b8a96768faf42cff5827ad1