Merge "Re-add gralloc 1.0 header" am: e7a66b9abc am: b92b5dea6b am: 59b534aafa
am: 99aaae95a3

Change-Id: Icefa3d974c9dfe048ec36b7a491686e1b5cdf9d4