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

Change-Id: I91e871bf6f4b24c70ce8538467134f198f7a1b4c