Merge "Remove libjavacrypto from Runtime APEX as not required."