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

Change-Id: Ib14f172d8600143d404337ccc767d24c63de32ac