General cleanup and aapt warning fixes.

Change-Id: Ib092d3eaa07a9ee5b1f8b79ca1f51fd0072b87ae