Merge "libbinder: remove Map" am: 2fee095137 am: 38371d28ff am: f3731b957b
am: 425947ce47

Change-Id: I758a85f1c30cad7eb3ad0829e8ab3367c442d3db