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

Change-Id: Idec294e8165b3314dea88c134f0269dd06f12e1a