Merge "SEPolicy changes to allow vendor BoringSSL self test."