am da6e899f: Add keymaster1 support to vold.

* commit 'da6e899f4e1429add2ef023e0cc6b0fcca42c945':
  Add keymaster1 support to vold.