Merge "Revert "Add build dependencies for split sepolicy files.""