Move CM config options after AOSP config options

Change-Id: I641a350fc9b6cc3af60ee818f90a826aba64f087
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2