Add proguard to make sure AVD's getter and setter still works am: 2210570454 am: 4862972f92
am: a258585eea

Change-Id: I97f8601078c0f59929db942c0f2311f003e3dd09