am 2436ea8a: Merge "Use i686-linux-android-4.6 for x86 build"

* commit '2436ea8a8c84d58befb4bf27d137d94c45b8cc8d':
  Use i686-linux-android-4.6 for x86 build