Merge "Make tinytemplate available to product and vendor am: 4c8f7b3cfc am: 241e0ca665 am: e64f5ad3c8 am: dbc42fd988 am: 516e15c6a4"