Merge "Move HMAC agreement to vold" into pi-dev am: 41705f271e
am: c2eeb54b87

Change-Id: Ic2c785189aa78c9d232e036d3b41e0446fa8fb75