Merge "identity: regenerate makefiles"