Merge changes I4ef53a09,I7c3c5bd5

* changes:
  Remove get_output_size() method from keymaster HAL.
  Add tag to allow caller-specified nonce.