am 1623f79c: Merge from ics-mr0

* commit '1623f79c7561b19f57c10ac303f6246deee7c634':
  use frozensets to represent APK cert sets