Merge "Export libjavacore into the conscrypt linker namespace." am: 43c17b0c03
am: e29eba6ce1

Change-Id: Ifb12717a76d31548fc55883e09a0b74782e6653e