Merge "Revert "Add LOCAL_ASSET_DIR support (-A) to aapt2""