Merge "init: Refactor selinux.h/cpp" am: c76078e4b6
am: 81a303eabf

Change-Id: I810444d380dfa7fa6fa25907bc3f78b6d2f1e834