Update shiba SVN to 11 Bug: 313696499 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:50247665a034fae474bce77bf17accd0163197f1) Merged-In: I8da0fcaf9e1d6e9cd6d4768f3628b43a62163688 Change-Id: I8da0fcaf9e1d6e9cd6d4768f3628b43a62163688