Merge "Add GCMParameterSpec to preloaded-classes"