Merge "Reland "Build mockwebserver with core_current"" am: 5ea6d395c5 am: 6b5ff527e5
am: 67bf89d8c6

Change-Id: I06315e5155f7b0be8513faea25447c6338f027ea