am 65b73f78: am 0f37a9d0: resolved conflicts for merge of 30044c61 to lmp-mr1-dev

* commit '65b73f78879acd4336726a0242b8bf6491fdf094':
  Change SELinux neverallow tests to be sepolicy-analyze based.