Merge "Re-add gralloc 1.0 header"