Merge "sepolicy: drop -- marker" am: 50f21eb113
am: 86f12e6dcb

* commit '86f12e6dcb5b321f4346f9442cb390ba032454c8':
  sepolicy: drop -- marker