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

* commit 'a7a4a16d5e0552c1a64a2f8205fe42089d4df2af':
  Line Wrapping General settings Set "Never join already wrapped lines" to true.
  Move files to proper location in development/ndk/platforms
  Blank Lines within class declarations Set "Before field declarations" value to 0.