Synchronizing templates with doclava's external ones.

Change-Id: Ida95fd6e2f4eb30fbc9200f585aed9dd20996f78
24 files changed