Merge heron into master (#2636)

4 files changed
tree: f28a35513e2a8d4323936c113662bd6cc7550257
  1. src/
  2. tools/
  3. build.gradle
  4. proguard-rules.pro