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

* commit '887d348d7ed5e1c2a1687eb774db46d571a8f43d':
  Insert Android Keystore JCA Provider at the correct position.