Merge "Remove libbinder from apex build"