am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev

* commit '7b734fd8d163f7a71254b909fbbcd358129924b7':
  Allow multiple asset directories in aapt

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build