am 92ffcc4d: Merge "Update copyright/license templates." into jb-mr2-dev-plus-aosp

* commit '92ffcc4d83077833cbe70e35498362e9d43968c2':
  Update copyright/license templates.