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

Change-Id: Ib5402b555f789e5958e41dd702a9c02400e88d60