Settings: Fix aapt zh-rTW warning

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