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