Merge "Remove unneeded aapt dependency"