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

Change-Id: I7fd1bc843ca31ca33e569e93047b1ce9e24e439c