am 119919b8: am 1240719a: am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"

* commit '119919b81a2aee7637219ea2c255fc55c886a11f':
  aapt: Allow raw "%" in unformatted string-arrays