am 8087e116: am da6e899f: Add keymaster1 support to vold.

* commit '8087e1165586f6c5ef5474855458f4379c225622':
  Add keymaster1 support to vold.