Merge "Fix incremental aapt builds" am: 26cf972f50
am: cd82b18c8d

Change-Id: I9c57501ace6d643d45239c0b797db747b531d949