Merge "Harmony: Add jarjar rules"
am: 90a57cb7ce

Change-Id: I976c5a82881a66c5c91eca199252e97ca48aeeaa