Settings: Remove aapt warnings

Change-Id: I475bcedff48f7e0bfbd8285ab41bd10d3759a1f9
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Settings: Fix aapt locale set

This allow to display Settings in other language other than default

Change-Id: Ie0d94a85b6b3f26cad853298b911c7fece0a1247
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'cm/cm-10.2' into dc43