Merge "libbinder: remove old functions"