Merge "Fix incremental builds with AAPT2"