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

Change-Id: Ib317841c2a217c7b6dcc55d76ced82545f1bd73c