Merge "Revert "Inline usage of jarjar_rules.txt""