Merge "Use external/mockwebserver in frameworks/base"