Merge "Add back keymaster@4.0 hash." into pie-vts-dev
am: 6a20e646e4

Change-Id: Id5a125e9a6563a71873e9edcc746c36bc8594c87