Merge "Use external/mockwebserver in libcore"