Merge "Include secilc and sepolicy conditionally, elsewhere" am: 3e78704825
am: 8fe478de64

Change-Id: I124bacdd15ad7edd1f5527005a726641c7c96d08