Merge "Update tests for synced changes to Conscrypt"