Merge \\"libagl: Switch from gralloc to GraphicBufferMapper\\" into nyc-mr1-dev am: b3a83a4814
am: 89ff3cdebb

Change-Id: Ia20b0642c0abbf9e3944e526d4b381ec05313790