Merge "Fix minadb_test build breakage."