Merge "Use -Werror in external/selinux" into oc-mr1-dev-plus-aosp