Merge "Remove incremental workaround for aapt overlays"
am: 946e58bdff

Change-Id: I44a7d1be8ea317e3ce861b2ce0418b112f80a323