Merge "Revert "Add build dependencies for split sepolicy files."" am: cbdc0bd096
am: 5e8be7b822

Change-Id: I6b1e6db6a505f8a65879228dc8fa9b1863724ca1