Merge "Use jarjar rules for framework.jar." am: b70a6cbf9a
am: 4382755210

Change-Id: Ib36a2c578ce37876dd1c544f471987b9a32bdc5a