Merge "Fix broke tests in android.nativeopengl" into lmp-dev