Update shiba SVN to 13 Bug: 313797924 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c2af899c7b3d7a28d6af7ea25828b654016ea2ec) Merged-In: Icba0028e5b0b47128946980e7f12af94c55943ac Change-Id: Icba0028e5b0b47128946980e7f12af94c55943ac