Merge "libbinder: remove Map"