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