Merge "emulator/opengl: Remove android::Mutex." into idea133