Merge "Generate "keep" rules for android:name and class attributes" am: a13d7fc861

Change-Id: I62bd14ae72f805d8326e67b91e6b3622615677fc