Merge "Add build dependencies for split sepolicy files." am: 298f9b5925
am: bc1832f381

Change-Id: Ic0a40500003afdd54e1a68cfec2937ae0f2aee06