Merge "Speed up WriteKeepSet when generate_conditional_proguard_rules is off."
am: a9ee3aaa5f

Change-Id: Id212eb75f3f880e5c9acaa6aae51aab872570133