Update shiba SVN to 37 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5b4b08ce53549d3158f81356491af4f70cc514d5) Merged-In: I0fd5f194fcb5d529fcbba4dfa524b23e24fb35e1 Change-Id: I0fd5f194fcb5d529fcbba4dfa524b23e24fb35e1