Merge "Harmony: Add jarjar rules"