Merge "Inline usage of jarjar_rules.txt"