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

Change-Id: Ifdc7f430bceb99612fb33244051703acf124d539