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

Change-Id: I4443b84896684ac3249108316487035319b4f52e