Merge pull request #12 from baidurom/coron-4.2

Merge coron-4.2 into coron-mtk-4.0