Merge "Track more changes to keymaster_defs.h"