m7-common: Allow multiple users

Allow users on all m7 variants to have multiple users on their device

Change-Id: I6b0e0ea2b503a6692b406ca41a555f24f88d4601
Merge branch 'cm' into HEAD