Revert^2 "Revise KeymasterMessage versioning system"

24d46bd51261e01785e1b03bdcb45545e4862b40

Change-Id: I4edcfdada8321ff181db70002a2661b821f6b33f
Bug: 176867651
Merged-In: Idefcdd64afa7977f6dc2c4299e69cc5065dcc20d
5 files changed