Merge "Implement keymaster 1.0 export_key method"