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

Change-Id: I955541f8d56c0b6b341833e6ba4ff9aa7b8c34c4