Merge "Remove agree_key and add configure to keymaster2." into nyc-dev