Merge "Update OTA to understand SELinux filesystem labels"