Merge "healthd: add sepolicy"