Merge "libbinder: remove Map" am: 2fee095137
am: 38371d28ff

Change-Id: I12afb5e1477dc942b1fe7c1114804fb25f879713