Merge "Add conscrypt, okhttp, bouncycastle to the classpath when building stubs"