Update shiba SVN to 21 Bug: 325156176 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:07379fae8b81a4238b8974f508c2ff8e00647d81) Merged-In: I864730ffcb48d6107531db9fcb6d2be962139b6b Change-Id: I864730ffcb48d6107531db9fcb6d2be962139b6b