Merge "Track recent keymaster_defs.h changes."