Update manifest.git
Merge branch 'coron-4.2' into coron-mtk-4.2