Merge "Keymint Support: Fix keymint_tags.h"