Settings: Remove aapt warnings

Change-Id: I475bcedff48f7e0bfbd8285ab41bd10d3759a1f9
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge branch 'cm-10.2' into martincz