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

Change-Id: I78e58b155cee575e5313effb642d3843ef9d75cc