Merge "Export libjavacore into the conscrypt linker namespace."
am: 01dfb9396f

Change-Id: I8c53708fe16c4d96949010336005162cf1b28962