am c9c4c77f: resolved conflicts for merge of 917e120f to jb-mr1-dev-plus-aosp

* commit 'c9c4c77f368938af19270da5ce24d0b8a94ece77':
  make_ext4fs: fix sepolicy lookup for lost+found