Merge remote-tracking branch 'upstream/pr1061' into apache-master
tree: 6c390873d53d3464dd812fd889c96a56e38c6283
  1. src/
  2. tools/
  3. build.gradle
  4. proguard-rules.pro