Merge "Add --output-text-symbols option to aapt. do not merge." into jb-dev