Merge "libagl: Switch from gralloc to GraphicBufferMapper" into nyc-mr1-dev