Merge "Remove reference to unused okhttp-test build target"