Merge "Add missing error codes from keymaster_defs.h." into mnc-dev