AriesParts: Update to 4.4 settings style

Change-Id: I378f74e06c21a1643a1a1f3e71f4e9aca1f6bbce
Merge branch 'cm-11.0' into kk_mkt