Merge "Revert "Remove libbinder from apex build""