Update shiba SVN to 7 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3a07bc24981bf07d5f41508ed921ea3041040293) Merged-In: Ib7c2f7a5b0c482fcce6f58fb4ff172a5bb8081a0 Change-Id: Ib7c2f7a5b0c482fcce6f58fb4ff172a5bb8081a0