Merge "Revert "Build mockwebserver with core_current"" am: 7c05da77a1 am: 21e85cb4dd
am: 9c1fa866c6

Change-Id: Iacbc5f6a29c9a22691be3b63579617b03ccaff2d