am 87ec5091: am 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"

* commit '87ec50914cdd290ad5486adad01cfad4a0b9f59d':
  Add GCMParameterSpec to preloaded-classes