Merge "Revert^2 "Remove libbinder from apex build""