Merge pull request #12 from jchen10/master

revert some int64 changes
fix the base/content unittests build errors