Merge "Merge "Support transform\'d GraphicBuffers" into nyc-dev am: 6d42b5c6e3 am: 1fd9f81745" into nyc-mr1-dev-plus-aosp