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

Change-Id: I5e6b621a55b6bd67f53559bc89dc0e757c1e74a5