Merge "libbinder: remove dead code for multiple contexts"