am be11de2b: am 5fb409b7: Merge "Bring the NOTICE files back up to date."

# Via Android Git Automerger (1) and others
* commit 'be11de2b52ac5f8cbb5a733821cb27002f2ea975':
  Bring the NOTICE files back up to date.