Merge "libbinder: re-mark debug function as extern "C""