Merge "Clear some aapt2.mk inputs after use"