Use mmosal from jf
Merge remote-tracking branches 'rqdev/cm-10.1' and 'rqkang/cm-10.1' into HEAD