Android 4.2 CTS release 2
Merge "Update x86 toolchain i686-linux-android-4.6"