Merge "Fix Mac compile error in debug_frame_writer.h"