Android 7.1.1 Release 56 (N8I11F)
Merge "Remove old opengl code and update references" into nyc-mr1-dev