am ae8d7d8e: (-s ours) am 12b225fb: Merge "Remove EGL random multithreaded resource...