Merge "Re-add gralloc 1.0 header" into nyc-mr1-dev