am f644f7d6: am b1ceaa32: am 03b1a002: (-s ours) am 32c3e965: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f644f7d6348edf1327d3a792c66e9446ed143511':
diff --git a/8/platforms/android-8/arch-mips b/8/platforms/android-8/arch-mips
new file mode 120000
index 0000000..68a7bea
--- /dev/null
+++ b/8/platforms/android-8/arch-mips
@@ -0,0 +1 @@
+../android-9/arch-mips
\ No newline at end of file
diff --git a/8/platforms/android-8/arch-x86 b/8/platforms/android-8/arch-x86
new file mode 120000
index 0000000..4f3bb09
--- /dev/null
+++ b/8/platforms/android-8/arch-x86
@@ -0,0 +1 @@
+../android-9/arch-x86
\ No newline at end of file