Merge "Update copyright/license templates." into jb-mr2-dev-plus-aosp