Merge "Gralloc 1.0" into nyc-dev