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

Change-Id: I02fd17b5b9ea68ac3a8e5a1191312246c5cd84d4