Fix a number of aapt warnings.

The remaining warnings have their origin in AOSP.

Change-Id: I070d3cc1f5e9d4fc2bf7e442e58fe2bdc100ed0e
Merge commit '6c8e4cec79e23bc44b9f060cd4852f455876d718' into cm-11.0