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

* commit '1240719ae06855d38f1fa159dd73e2109bb9586f':
  aapt: Allow raw "%" in unformatted string-arrays