Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev