Merge "Add proguard to make sure AVD's getter and setter still works" into nyc-mr1-dev am: f0f4ec71d4 am: 8b15234624 am: 5fce9f6cf5
am: 8b59862e30

Change-Id: I2a0c498c4653853df3ec07b5d25663c99116a7e0