Android S V2 Preview 1
Merge changes from topic "revert-1827311-update_libselinux-DZVXTWIYPG" am: e9d4c554c2

Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/1832310

Change-Id: I91af411a249fb8667a1f97ff46bffaec7cfac627