Merge "Settings: Fix Slovak aapt warnings" into cm-10.1

Change-Id: I55413dbb6ba23bd13d4e5564e5b68572e2a2c688