Android CTS 7.1 Release 5 (3943087)
Merge "Remove old opengl code and update references" into nyc-mr1-dev