Merge "Fix the logic to add suffix when copying." into nyc-dev
tree: dcaa096ae624174173c5169b437f5e32ca6e9586
  1. jni/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags