Fixed aapt warning

Change-Id: I5f2664297ee1a68cfc1d9982771e7842cf8439e0
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1