Merge "aapt: Allow raw "%" in unformatted string-arrays"