Merge "Recursively restorecon when SELinux label changes." into nyc-mr1-dev
am: 8423493a85

Change-Id: I7f72932873fd437b07d662fd0c27af8b4baadbe1