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

Change-Id: Ia0ca9275c491b96ac436be077f7bcfef0a425232