Merge "libbinder: remove dead code for multiple contexts" am: 68092483b8 am: cec2b56575
am: d85cb03061

Change-Id: I3d3d43a85416f0ad9c475dc36a4b2629dd26296a