Updated to build as a subproject, update to openssl-1.0.1j