Merge "Fix debuggerd "format '%p'" build breakage."