Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e am: 5995579f5f
am: 00245ffce4

* commit '00245ffce4d08fbb6aeaeba62b8a30ce234862fa':
  Insert Android Keystore JCA Provider at the correct position.