am 15c3e01e: am 3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '15c3e01e05359fb11ce5e63934d7c3d54d0d6e93':