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

Change-Id: Ib56cfebaed5fb45d4a506bf712c195ad6dffb142