Merge "Reland "Build mockwebserver with core_current""