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

Change-Id: I3f4d00d81d5cad38ea72b6749173f60d56f5567e