Merge "libbinder: save space for optional config options."