Merge "Update proguard config to match ag/3468816"