Revert "remove aapt warnings"

This reverts commit 3672f206afd2b11e16df1aac3d63fea3350452d2.

Change-Id: I1ee3ac544443e68b0705404e54a9e49f83c25c12