am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '20b5fd98fb9c80ed29d57d67eb706a36b02708da':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.