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

Change-Id: I85027c5a87f9acd2c67a804bcfe8c3f7346fdbc3