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

Change-Id: I1c77c95f7c4d1038e8607eab520214f18045c5d5