DO NOT MERGE: Fix various settings chassification bugs am: 6d4565e72d

Change-Id: I07c1f1814760006b752d9fa88b1f28b36a473772
tree: 8768cffc3859a6a54a7afa417ee3163c4275cc7a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg