Merge "Allow modules to be added to ART sdk" am: c90b0664c3

Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1398493

Change-Id: I5aaa6e9da4feaa41eb3e21202b22222a2a45822c