am 549db46c: Merge change 21413 into eclair

Merge commit '549db46cb31725a66cd32ad4e0abb0d60d893fca'

* commit '549db46cb31725a66cd32ad4e0abb0d60d893fca':
  Fix aapt to be able to add configs from overlays.