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

* commit '2a288babaef57308e042ed97caea6b49c8ae5033':
  Add GCMParameterSpec to preloaded-classes