Merge change 21413 into eclair

* changes:
  Fix aapt to be able to add configs from overlays.