merge new changes for both cm and mokee
update kernel from new EMUI ROM
fix sim card issue with EMUI camera/gallery patch
update recovery.fstab to version 2 layout