Merge commit 'bf8b5480406b5b881649f04eab2a12d8b8c5149f' of sso://googleplex-android/platform/external/python/jinja into HEAD
Change-Id: Ic4c5af671601cb7989a6737de0b3846aaa018768