Split Conscrypt makefile out from libcore

Change-Id: I6c12a0e038a86b186b5d88b9f0ff28b8480b4aed
Merge "Split Conscrypt makefile out from libcore"
Fix dalvik-host libjavacrypto dependency

Change-Id: I6e856f6d5dbbc6a852a698ae495a8e83356434f2
Merge "Fix dalvik-host libjavacrypto dependency"
Try to fix the continuous build by building libjavacore.so.

(cherry picked from commit 0d302d7c175790ce6ea25e0b1d7981426f8379d4)

Change-Id: Ia482a15b2a8cfe9a08c63068cd1d3dd1e4d4d0b3
Merge "Try to fix the continuous build by building libjavacore.so."
Add a missing expectation for ASCIICharsetEncoderTest.

Bug: 10837242
Bug: 10729779
Change-Id: I014f8646b8782973c13a3a327b4fba8b90e8d0cb
Merge "Add a missing expectation for ASCIICharsetEncoderTest."
Merge https://android.googlesource.com/platform/libcore into jb-devel-mr2-release