...that had been used for DBG_CTOR, DBG_PROF, etc. Change-Id: I8eac38e24b7110511feb7813aaf5a20ab82bdbe0