Android S Beta 1
Merge changes I79614739,I357a4454

* changes:
  Improve selinux concurrency test reliability
  Keystore 2.0: Test libselinux concurrent access.