Merge "Fix aapt2 pseudo-translating donottranslate* files"