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

Change-Id: I1479192ca59a7138543663581ea80bea793b555a