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

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