Merge "Add libjavacrypto.so to the runtime APEX"