am 096dd2dd: am ab083da0: Merge "Set SELinux contexts on device nodes created by vold."

* commit '096dd2dd8c0294253c4b88b2c02715bf56e0287c':