Merge "Remove binder_node_debug_info definition." am: 7392a5c646
am: b7350658a5

Change-Id: I90e83abcdf8bc4b0d0d7f8c3ed98850b3c144d8c