am 353d3bf8: (-s ours) Update emulator binaries to fix platform boot.

* commit '353d3bf831cbd1f33d918381a7fcf0259a47debd':
  Update emulator binaries to fix platform boot.
diff --git a/README b/README
index 5a1d666..3131294 100644
--- a/README
+++ b/README
@@ -10,71 +10,12 @@
 
 Below is the list of specific commits for each input directory used:
 
-external/qemu        7180616 Set androidboot.hardware to goldfish for all non DT platforms
-external/qemu-android 055e954 hw/i386: Enable goldfish framebuffer
+external/qemu        8ada71a emugl: Document FrameBuffer class.
+external/qemu-android 8ad041c hw/arm/ranch.c: Add firmware node to DT
 external/gtest       56cad54 Use an older standard for the NDK gtest libs.
 
 Summary of changes:
 
-    $ cd external/qemu && git log --oneline --no-merges 872a017..7180616 .
-        7180616 Set androidboot.hardware to goldfish for all non DT platforms
-        e8ddc8d Initialization routines to support alternative GLES implementations.
-        5c9cd82 Changing the core of the GLES dispatcher into a struct.
-        bdb357d Removing obsolete GLDispatch.* files from GLES_CM
-        d6c498d build-mesa.sh: Also build OSMesa library.
-        85ca2a3 emugl: Switch {create,destroy}OpenGLSubwindow() to return bool.
-        85677dc emugl: EglOsApi.h: Remove EglConfig.h dependency.
-        00146ec emugl: EglOSApi.h: Introduce EglOS::Engine interface.
-        660815c emugl: Remove EGLNativePixelFormat.
-        0e54a28 emugl: Get rid of EGLNativeContextType
-        49e304b emugl: Remove EGLNativePbufferType
-        f1397e1 emugl: Get rid of EGLNativeSurfaceType.
-        eef66f3 emugl: Remove EGLNativeInternalDisplayType.
-        97c8fe0 emugl: EglOsApi.h: Get rid of EGLNativeInternalDisplayType wrappers.
-        5af19ea emugl: EglOsApi_darwin.cpp: Implement EglOS::Display sub-class.
-        9ef7bc5 emugl: EglOsApi_wgl.cpp: Implement EglOS::Display instance.
-        6fbff29 emugl: EglOsApi.h: Implement GLX-based Display class.
-        5177ae7 emugl: EglOsApi.h: Add Display interface class.
-        d8d855f emugl: EglOsApi_xxx.cpp: Minor cleanup and reformatting.
-        5aa342e emugl: eglinternalplatform.h: Move and rename to EglInternal.h
-        9c9ba9d emugl: EglDisplay: remove m_isDefault member.
-        0567e28 emugl: EglOsApi.h: Rename implementation sources.
-        6168695 emugl: EglOsApi.h: Remove EglSurface.h include.
-        8cc55f5 emugl: EglOsApi.h: Remove EglPbufferSurface.h include.
-        b4138d6 emugl: EglOsApi.h: Remove EglDisplay.h include.
-        e1fd882 changed IFS so line parsing also works in 'sh'
-        5d56c6a do not exit script when exit status of "which" is not zero
-        57f6e9a Revert "Fix Darwin builds."
-        7a35165 Fix Darwin builds.
-        2afc613 Add Windows icons to ranchu launcher programs.
-        0e07663 package-release.sh: Add missing PC Bios files.
-        97c3f69 emugl: Refactor RenderContext class.
-        10588f5 emugl: Refactor ColorBuffer class.
-        0f328c5 emugl: Refactor WindowSurface class.
-        3bef521 emugl: Refactor FbConfig class.
-        f1da503 docs/DEVELOPMENT.TXT: Update active branch to studio-1.3-dev
-        e74b883 Switch libOpenglRender to GLES 2.x
-        4cdc8f9 emugl: Make GLES 2.x mandatory.
-        fa25efc emugl: Get rid of obsolete WITH_GLESV2 macro.
-        b6bc76d Avoid flooding emulator output with unhelpful messages
-        c24cb7c Blocking SIGALRM while using connect syscall to connect emulator to adb
-        53f1955 emugl: Rename NativeSubWindow sources.
-        87a4ca0 emugl: NativeSubWindow.h: Remove redundant display parameter.
-        627d8cd emugl: Simplify GLESv1 dispatch sources.
-        11c6554 emugl: Rename GLESv2 dispatch global variables and functions.
-        93ee47e emugl: Rename GLESv1 dispatch global variables and functions.
-        ca7964e emugl: Rename GLES 2.x decoder sources.
-        83e8595 emugl: Rename GLES 1.x Decoder sources.
-        c9733eb emugl: Rename GLES dispatch headers and sources.
-        4616e99 package-release.sh: Fix invalid shell invokation.
-        12bbb31 android-configure.sh: Fix OS X SDK detection
-        86ef9be Copy lib64 to tools/lib64 during release
-        4463b53 Fix emulator crash with "-gpu on"
-        39c16e2 Allow framebuffer heights that are not multiples of 4.
-        c7e7d8a Disable waiting for RenderThread termination on windows
-
-    $ cd external/qemu-android && git log --oneline --no-merges bfcdfdb..055e954 .
-        055e954 hw/i386: Enable goldfish framebuffer
-        a041520 hw/i386: enabled android pipe
-
+    # No changes to external/qemu
+    # No changes to external/qemu-android
     # No changes to external/gtest
diff --git a/darwin-x86_64/emulator b/darwin-x86_64/emulator
index 7308072..8a2b04b 100755
--- a/darwin-x86_64/emulator
+++ b/darwin-x86_64/emulator
Binary files differ
diff --git a/darwin-x86_64/emulator64-arm b/darwin-x86_64/emulator64-arm
index 458ab4e..7ecc40a 100755
--- a/darwin-x86_64/emulator64-arm
+++ b/darwin-x86_64/emulator64-arm
Binary files differ
diff --git a/darwin-x86_64/emulator64-mips b/darwin-x86_64/emulator64-mips
index c77ff0f..884d7ca 100755
--- a/darwin-x86_64/emulator64-mips
+++ b/darwin-x86_64/emulator64-mips
Binary files differ
diff --git a/darwin-x86_64/emulator64-ranchu-arm64 b/darwin-x86_64/emulator64-ranchu-arm64
index b481495..bdb315f 100755
--- a/darwin-x86_64/emulator64-ranchu-arm64
+++ b/darwin-x86_64/emulator64-ranchu-arm64
Binary files differ
diff --git a/darwin-x86_64/emulator64-ranchu-mips64 b/darwin-x86_64/emulator64-ranchu-mips64
index 5fb1206..6ff20bd 100755
--- a/darwin-x86_64/emulator64-ranchu-mips64
+++ b/darwin-x86_64/emulator64-ranchu-mips64
Binary files differ
diff --git a/darwin-x86_64/emulator64-x86 b/darwin-x86_64/emulator64-x86
index 54b690f..8c4b62d 100755
--- a/darwin-x86_64/emulator64-x86
+++ b/darwin-x86_64/emulator64-x86
Binary files differ
diff --git a/darwin-x86_64/lib64/lib64EGL_translator.dylib b/darwin-x86_64/lib64/lib64EGL_translator.dylib
index f55da08..3fd275a 100755
--- a/darwin-x86_64/lib64/lib64EGL_translator.dylib
+++ b/darwin-x86_64/lib64/lib64EGL_translator.dylib
Binary files differ
diff --git a/darwin-x86_64/lib64/lib64GLES_CM_translator.dylib b/darwin-x86_64/lib64/lib64GLES_CM_translator.dylib
index 013e229..e9bfa2f 100755
--- a/darwin-x86_64/lib64/lib64GLES_CM_translator.dylib
+++ b/darwin-x86_64/lib64/lib64GLES_CM_translator.dylib
Binary files differ
diff --git a/darwin-x86_64/lib64/lib64GLES_V2_translator.dylib b/darwin-x86_64/lib64/lib64GLES_V2_translator.dylib
index 3c0dfbe..de29933 100755
--- a/darwin-x86_64/lib64/lib64GLES_V2_translator.dylib
+++ b/darwin-x86_64/lib64/lib64GLES_V2_translator.dylib
Binary files differ
diff --git a/darwin-x86_64/lib64/lib64OpenglRender.dylib b/darwin-x86_64/lib64/lib64OpenglRender.dylib
index eb8be90..71a600f 100755
--- a/darwin-x86_64/lib64/lib64OpenglRender.dylib
+++ b/darwin-x86_64/lib64/lib64OpenglRender.dylib
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64 b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64
index 6ce234f..2727f66 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-mips64el b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-mips64el
index 9247679..084ac72 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-mips64el
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-mips64el
Binary files differ
diff --git a/linux-x86_64/emulator b/linux-x86_64/emulator
index a68341e..461188a 100755
--- a/linux-x86_64/emulator
+++ b/linux-x86_64/emulator
Binary files differ
diff --git a/linux-x86_64/emulator-arm b/linux-x86_64/emulator-arm
index 60632a4..8c5776d 100755
--- a/linux-x86_64/emulator-arm
+++ b/linux-x86_64/emulator-arm
Binary files differ
diff --git a/linux-x86_64/emulator-mips b/linux-x86_64/emulator-mips
index 62daf68..f71636f 100755
--- a/linux-x86_64/emulator-mips
+++ b/linux-x86_64/emulator-mips
Binary files differ
diff --git a/linux-x86_64/emulator-ranchu-arm64 b/linux-x86_64/emulator-ranchu-arm64
index a71fdbd..2304633 100755
--- a/linux-x86_64/emulator-ranchu-arm64
+++ b/linux-x86_64/emulator-ranchu-arm64
Binary files differ
diff --git a/linux-x86_64/emulator-ranchu-mips64 b/linux-x86_64/emulator-ranchu-mips64
index b8a37f4..d5ccae2 100755
--- a/linux-x86_64/emulator-ranchu-mips64
+++ b/linux-x86_64/emulator-ranchu-mips64
Binary files differ
diff --git a/linux-x86_64/emulator-x86 b/linux-x86_64/emulator-x86
index eff821b..13bb0b8 100755
--- a/linux-x86_64/emulator-x86
+++ b/linux-x86_64/emulator-x86
Binary files differ
diff --git a/linux-x86_64/emulator64-arm b/linux-x86_64/emulator64-arm
index 9024bd7..1cb2247 100755
--- a/linux-x86_64/emulator64-arm
+++ b/linux-x86_64/emulator64-arm
Binary files differ
diff --git a/linux-x86_64/emulator64-mips b/linux-x86_64/emulator64-mips
index 3034cc3..7de38c4 100755
--- a/linux-x86_64/emulator64-mips
+++ b/linux-x86_64/emulator64-mips
Binary files differ
diff --git a/linux-x86_64/emulator64-ranchu-arm64 b/linux-x86_64/emulator64-ranchu-arm64
index bd75feb..c69d175 100755
--- a/linux-x86_64/emulator64-ranchu-arm64
+++ b/linux-x86_64/emulator64-ranchu-arm64
Binary files differ
diff --git a/linux-x86_64/emulator64-ranchu-mips64 b/linux-x86_64/emulator64-ranchu-mips64
index 0730d36..277b28f 100755
--- a/linux-x86_64/emulator64-ranchu-mips64
+++ b/linux-x86_64/emulator64-ranchu-mips64
Binary files differ
diff --git a/linux-x86_64/emulator64-x86 b/linux-x86_64/emulator64-x86
index e6253f4..0206a92 100755
--- a/linux-x86_64/emulator64-x86
+++ b/linux-x86_64/emulator64-x86
Binary files differ
diff --git a/linux-x86_64/lib/gles_mesa/libGL.so b/linux-x86_64/lib/gles_mesa/libGL.so
index 86a45e4..75e18c3 100755
--- a/linux-x86_64/lib/gles_mesa/libGL.so
+++ b/linux-x86_64/lib/gles_mesa/libGL.so
Binary files differ
diff --git a/linux-x86_64/lib/gles_mesa/libosmesa.so b/linux-x86_64/lib/gles_mesa/libosmesa.so
new file mode 100755
index 0000000..7244ab5
--- /dev/null
+++ b/linux-x86_64/lib/gles_mesa/libosmesa.so
Binary files differ
diff --git a/linux-x86_64/lib/libEGL_translator.so b/linux-x86_64/lib/libEGL_translator.so
index 51953e7..e39712b 100755
--- a/linux-x86_64/lib/libEGL_translator.so
+++ b/linux-x86_64/lib/libEGL_translator.so
Binary files differ
diff --git a/linux-x86_64/lib/libGLES_CM_translator.so b/linux-x86_64/lib/libGLES_CM_translator.so
index 00fae8c..8f8bf9c 100755
--- a/linux-x86_64/lib/libGLES_CM_translator.so
+++ b/linux-x86_64/lib/libGLES_CM_translator.so
Binary files differ
diff --git a/linux-x86_64/lib/libGLES_V2_translator.so b/linux-x86_64/lib/libGLES_V2_translator.so
index e540f0f..b61c801 100755
--- a/linux-x86_64/lib/libGLES_V2_translator.so
+++ b/linux-x86_64/lib/libGLES_V2_translator.so
Binary files differ
diff --git a/linux-x86_64/lib/libOpenglRender.so b/linux-x86_64/lib/libOpenglRender.so
index ad59517..ce5c257 100755
--- a/linux-x86_64/lib/libOpenglRender.so
+++ b/linux-x86_64/lib/libOpenglRender.so
Binary files differ
diff --git a/linux-x86_64/lib64/gles_mesa/libGL.so b/linux-x86_64/lib64/gles_mesa/libGL.so
index 0e93085..677c627 100755
--- a/linux-x86_64/lib64/gles_mesa/libGL.so
+++ b/linux-x86_64/lib64/gles_mesa/libGL.so
Binary files differ
diff --git a/linux-x86_64/lib64/gles_mesa/libosmesa.so b/linux-x86_64/lib64/gles_mesa/libosmesa.so
new file mode 100755
index 0000000..c767f51
--- /dev/null
+++ b/linux-x86_64/lib64/gles_mesa/libosmesa.so
Binary files differ
diff --git a/linux-x86_64/lib64/lib64EGL_translator.so b/linux-x86_64/lib64/lib64EGL_translator.so
index cbcd433..7455134 100755
--- a/linux-x86_64/lib64/lib64EGL_translator.so
+++ b/linux-x86_64/lib64/lib64EGL_translator.so
Binary files differ
diff --git a/linux-x86_64/lib64/lib64GLES_CM_translator.so b/linux-x86_64/lib64/lib64GLES_CM_translator.so
index 9d4bbfb..1296651 100755
--- a/linux-x86_64/lib64/lib64GLES_CM_translator.so
+++ b/linux-x86_64/lib64/lib64GLES_CM_translator.so
Binary files differ
diff --git a/linux-x86_64/lib64/lib64GLES_V2_translator.so b/linux-x86_64/lib64/lib64GLES_V2_translator.so
index 8af4204..fc79cad 100755
--- a/linux-x86_64/lib64/lib64GLES_V2_translator.so
+++ b/linux-x86_64/lib64/lib64GLES_V2_translator.so
Binary files differ
diff --git a/linux-x86_64/lib64/lib64OpenglRender.so b/linux-x86_64/lib64/lib64OpenglRender.so
index 4b73534..a5bdfdd 100755
--- a/linux-x86_64/lib64/lib64OpenglRender.so
+++ b/linux-x86_64/lib64/lib64OpenglRender.so
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86/qemu-system-aarch64 b/linux-x86_64/qemu/linux-x86/qemu-system-aarch64
index 6f4f3b3..ca30f21 100755
--- a/linux-x86_64/qemu/linux-x86/qemu-system-aarch64
+++ b/linux-x86_64/qemu/linux-x86/qemu-system-aarch64
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86/qemu-system-mips64el b/linux-x86_64/qemu/linux-x86/qemu-system-mips64el
index 8eb037a..0e630c6 100755
--- a/linux-x86_64/qemu/linux-x86/qemu-system-mips64el
+++ b/linux-x86_64/qemu/linux-x86/qemu-system-mips64el
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64 b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
index 69765c4..5118278 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-mips64el b/linux-x86_64/qemu/linux-x86_64/qemu-system-mips64el
index 9482d2e..049fc34 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-mips64el
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-mips64el
Binary files differ
diff --git a/windows/emulator-arm.exe b/windows/emulator-arm.exe
index d6ace4f..db58411 100755
--- a/windows/emulator-arm.exe
+++ b/windows/emulator-arm.exe
Binary files differ
diff --git a/windows/emulator-mips.exe b/windows/emulator-mips.exe
index a056969..170de47 100755
--- a/windows/emulator-mips.exe
+++ b/windows/emulator-mips.exe
Binary files differ
diff --git a/windows/emulator-ranchu-arm64.exe b/windows/emulator-ranchu-arm64.exe
index fe97464..7378c0f 100755
--- a/windows/emulator-ranchu-arm64.exe
+++ b/windows/emulator-ranchu-arm64.exe
Binary files differ
diff --git a/windows/emulator-ranchu-mips64.exe b/windows/emulator-ranchu-mips64.exe
index b4fce2b..686adf4 100755
--- a/windows/emulator-ranchu-mips64.exe
+++ b/windows/emulator-ranchu-mips64.exe
Binary files differ
diff --git a/windows/emulator-x86.exe b/windows/emulator-x86.exe
index 6804b7c..dde97d6 100755
--- a/windows/emulator-x86.exe
+++ b/windows/emulator-x86.exe
Binary files differ
diff --git a/windows/emulator.exe b/windows/emulator.exe
index b27a72f..d2042a2 100755
--- a/windows/emulator.exe
+++ b/windows/emulator.exe
Binary files differ
diff --git a/windows/emulator64-ranchu-arm64.exe b/windows/emulator64-ranchu-arm64.exe
index fcd4fe0..d7de333 100755
--- a/windows/emulator64-ranchu-arm64.exe
+++ b/windows/emulator64-ranchu-arm64.exe
Binary files differ
diff --git a/windows/emulator64-ranchu-mips64.exe b/windows/emulator64-ranchu-mips64.exe
index c370878..1292bac 100755
--- a/windows/emulator64-ranchu-mips64.exe
+++ b/windows/emulator64-ranchu-mips64.exe
Binary files differ
diff --git a/windows/lib/gles_mesa/opengl32.dll b/windows/lib/gles_mesa/opengl32.dll
index 60accb3..1926e2f 100755
--- a/windows/lib/gles_mesa/opengl32.dll
+++ b/windows/lib/gles_mesa/opengl32.dll
Binary files differ
diff --git a/windows/lib/gles_mesa/osmesa.dll b/windows/lib/gles_mesa/osmesa.dll
new file mode 100755
index 0000000..928e667
--- /dev/null
+++ b/windows/lib/gles_mesa/osmesa.dll
Binary files differ
diff --git a/windows/lib/libEGL_translator.dll b/windows/lib/libEGL_translator.dll
index ffcf6b0..1bb53bb 100755
--- a/windows/lib/libEGL_translator.dll
+++ b/windows/lib/libEGL_translator.dll
Binary files differ
diff --git a/windows/lib/libGLES_CM_translator.dll b/windows/lib/libGLES_CM_translator.dll
index 8222824..543532f 100755
--- a/windows/lib/libGLES_CM_translator.dll
+++ b/windows/lib/libGLES_CM_translator.dll
Binary files differ
diff --git a/windows/lib/libGLES_V2_translator.dll b/windows/lib/libGLES_V2_translator.dll
index 8c45ab3..b3422ba 100755
--- a/windows/lib/libGLES_V2_translator.dll
+++ b/windows/lib/libGLES_V2_translator.dll
Binary files differ
diff --git a/windows/lib/libOpenglRender.dll b/windows/lib/libOpenglRender.dll
index dcea1ff..0ef65e7 100755
--- a/windows/lib/libOpenglRender.dll
+++ b/windows/lib/libOpenglRender.dll
Binary files differ
diff --git a/windows/lib64/gles_mesa/opengl32.dll b/windows/lib64/gles_mesa/opengl32.dll
index 1498343..1790017 100755
--- a/windows/lib64/gles_mesa/opengl32.dll
+++ b/windows/lib64/gles_mesa/opengl32.dll
Binary files differ
diff --git a/windows/lib64/gles_mesa/osmesa.dll b/windows/lib64/gles_mesa/osmesa.dll
new file mode 100755
index 0000000..4cf5f05
--- /dev/null
+++ b/windows/lib64/gles_mesa/osmesa.dll
Binary files differ
diff --git a/windows/qemu/windows-x86/qemu-system-aarch64.exe b/windows/qemu/windows-x86/qemu-system-aarch64.exe
index b69e559..00b913c 100755
--- a/windows/qemu/windows-x86/qemu-system-aarch64.exe
+++ b/windows/qemu/windows-x86/qemu-system-aarch64.exe
Binary files differ
diff --git a/windows/qemu/windows-x86/qemu-system-mips64el.exe b/windows/qemu/windows-x86/qemu-system-mips64el.exe
index 92a708a..28d50fb 100755
--- a/windows/qemu/windows-x86/qemu-system-mips64el.exe
+++ b/windows/qemu/windows-x86/qemu-system-mips64el.exe
Binary files differ
diff --git a/windows/qemu/windows-x86_64/qemu-system-aarch64.exe b/windows/qemu/windows-x86_64/qemu-system-aarch64.exe
index 41b6035..071329f 100755
--- a/windows/qemu/windows-x86_64/qemu-system-aarch64.exe
+++ b/windows/qemu/windows-x86_64/qemu-system-aarch64.exe
Binary files differ
diff --git a/windows/qemu/windows-x86_64/qemu-system-mips64el.exe b/windows/qemu/windows-x86_64/qemu-system-mips64el.exe
index 1507160..03bbb5b 100755
--- a/windows/qemu/windows-x86_64/qemu-system-mips64el.exe
+++ b/windows/qemu/windows-x86_64/qemu-system-mips64el.exe
Binary files differ