Merge "revert due to the sqlite build problem on Mac.."