Merge changes Iaa66baa5,If62837bf,If2b736fc

* changes:
  On-device signing: Verify signature of odsign.info.
  On-device signing: Support keystore2 for keys.
  Support devices without fs-verity.