Cherry-pick 2 commits from the upstream

 * 3e79254: Work around for a buggy Lato font
 * 13fa85a: Another limitation for bytecode loop count maximum

BUG: 35785191
Test: Run test app in the bug or Wunderlist app
Change-Id: Ia2236db1dbf58178e228d47a1fd39ffb8be09b47
1 file changed