Merge "Fix incremental aapt builds"