Merge "Fix precompiled sepolicy logic"