Fixed aapt warnings

Change-Id: I35389697266b3ec59a38b4142a8983d0a8cc31ac
Merge "Fixed aapt warnings" into cm-10.1
Merge remote branch 'cm/cm-10.1' into cm-10.1