Revert most of the message versioning update. am: 7113040462

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1533681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10693196aabc3fb7e0f4176969d17ac941d2f418