Merge "Revert "Update OTA to understand SELinux filesystem labels""