Merge commit '3e013f9387c8370dd9bd729e05799cbdcb924005' as 'third_party/ctemplate'

Change-Id: Ie20726199c36cc8bf7372e1f6f4a547c29c18cc5
210 files changed