Settings: Fix aapt warnings

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