Phone: Fix reorganization

Thanks to Andrew Jiang

Change-Id: I686cdd972587979903293f3e428e314c4d1d49bb
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1