Merge "Speed up WriteKeepSet when generate_conditional_proguard_rules is off." am: a9ee3aaa5f am: 1f44c03058
am: 65e3a342c4

Change-Id: Ifc50ebb69bb6e89fb74c147328eca3c90df7acbf