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

Change-Id: Iff8d87cebba09bd9d450853994aecb91b6c90e65