Merge "Use -Werror in external/selinux" into oc-mr1-dev-plus-aosp
am: 67581f7fa2

Change-Id: I97860fa84b4b146ce0f5661b07f39bc8bd1c0630