Merge "Update the NOTICE file from BoringSSL." am: 167fa8e5ad
am: e4f91528b6

Change-Id: Iac023eb52b044dbc8bb0b1bcbd8608066e363d81