Merge "Allow multiple asset directories in aapt" into klp-modular-dev