Merge "Keystore 2.0: Protect libselinux against concurrent access."