Merge "Switch minadb over to C++."