Merge "Add libcore as owners of relevant android/net files" am: 24f3809258
am: 484a866b19

Change-Id: I3f54ec1dd84e95c6efb216f64da8a9f26799d149