Merge "Clear some aapt2.mk inputs after use" am: 70964e8024
am: 1684afb6ee

Change-Id: I0a088af07c8a6af49db2c05152701dd36d20b28a