Update shiba SVN to 35 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:633317c02cf441e3fc03151ed15ecb72bd29fd98) Merged-In: Ib5c55167cdc0bbae64e48adb6778c445a38e5cc1 Change-Id: Ib5c55167cdc0bbae64e48adb6778c445a38e5cc1