Merge "Fix incremental builds with AAPT2" am: d25d80e193
am: b99d4b9e55

Change-Id: Ia623c9d0dddd26478174044c83c3eab34edc322b