Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev