Merge "libbinder: remove Map"
am: 2fee095137

Change-Id: I7c5e05a588e74285b343e63f3101211f59df716a