Merge "libbinder: remove old functions" am: e26963d005
am: 23176ca249

Change-Id: I748f22c944263507353f878f3461f27fc7ccfae8