Merge "Add support for "-rtl" in resources" into jb-mr1-dev