Add CMAccount

Change-Id: I3f6bca942bf7a07a979a5170b9896765d6f398ff
Merge branch 'cyanogenmod' into cm-10.2