Merge "Stop mixing and matching platform and NDK." am: b0d902f
am: eee3201

* commit 'eee3201c74faa86448df8c6ae3e5c5f356042a08':
  Stop mixing and matching platform and NDK.