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

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