am 7a85c42b: Merge "Update generate-NOTICE.py to know about tzdata."

* commit '7a85c42b8f7af801a31208ed83589b5397baee73':
  Update generate-NOTICE.py to know about tzdata.