am d2454506: Merge "Move files to proper location in development/ndk/platforms"

* commit 'd24545065acbacc7e9f1482f08013a4046640ad7':
  Move files to proper location in development/ndk/platforms