Android S Beta 1
Merge "selinux: remove last slash in CE dirs macro"