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

Change-Id: I53aa946b0e13976111e976096c63f6c74d5f249d