Merge "Add delete_all to keymaster API"