Merge "Add proguard to make sure AVD's getter and setter still works" into nyc-mr1-dev