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

Change-Id: I9c19fd1e962d915d13918be1682f80cd5feec7d3