Merge "get rid of the dependency on utils/CallStack.h"