Revert "Load default KeyFactory instead of BC's implementation" am: a2794f8f23

Change-Id: I21c13b0424d842b2729ef5c4e77236ed54fb503a