am 6a44d227: Merge "Take some fixed upstream copyright headers and regenerate NOTICE."

* commit '6a44d2271f372d0c65b05a5d3377bd00ce92824e':
  Take some fixed upstream copyright headers and regenerate NOTICE.