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