Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp

* changes:
  e2fsdroid: use libselinux function to read file context on device am: 2fff6fb036
  Require mke2fs.conf when building mke2fs am: 778eaa84a0