Merge "Add libjavacrypto.so to the runtime APEX" am: 814aa7101f
am: 501dbeeccf

Change-Id: I0bac52fc5ba50b8485c5e7a56472024084451303