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

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