Merge "Do Keymaster HMAC key agreement in vold." into pi-dev