am 816f682c: Merge "Fix proguard flags"

* commit '816f682c396282f2107dd4fad77dbacd157381da':
  Fix proguard flags