Merge "Revert "sepolicy: fix support for lmkd""