Merge "Put back @interface in proguard flags"
am: f774983a5d

* commit 'f774983a5d084805c48947f1b3a9921209ff1bca':
  Put back @interface in proguard flags