Merge "Insert Android Keystore JCA Provider at the correct position."