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

Change-Id: Ic1ee8922daa66dde68728bbf950bd8045eb2ac06
tree: 00e7f1cd1c919b30ac621f4cf43dcef22bb3f424
  1. src/
  2. Android.mk
  3. COPYING
  4. MODULE_LICENSE_APACHE2