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