Merge "Add missing error codes from keymaster_defs.h."