cm: Add CMAccount to the build

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