Merge "Remove agree_key and add configure to keymaster2." into nyc-dev
am: 869ba42

* commit '869ba4241bfce1c274814134279eb983c99e6355':
  Remove agree_key and add configure to keymaster2.