Merge "Add back keymaster@4.0 hash." into pi-dev am: 095e15e000
am: 313379462a

Change-Id: Iaec48d8fc165c25ee782db1f333b85b2871fe3cc