Fix a number of aapt warnings.

Change-Id: I070d3cc1f5e9d4fc2bf7e442e58fe2bdc100ed0e