am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."

* commit 'e3b1810e7e15a12512beb285a83a65a803d55366':
  Unify toolbox restorecon and libselinux restorecon implementations.