am 35d909c0: am 3f74023e: am 5b065655: am 48b13a58: am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev

* commit '35d909c0d4e9ccfa3eefb5ca1f907c048513bacf':
  Keymaster digest/padding NONE no longer means ANY.