Fixed aapt warning

Change-Id: I091a385aff272ec2d8a39a0acc2bc33fa3a08662
Merge remote branch 'cm/cm-10.1'