Update cheetah SVN to 60 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cf3cc4a874e817fb330988d982866183eba79208) Merged-In: Id9033d8d37de66bbb238aead0dbf7f380f4f9d10 Change-Id: Id9033d8d37de66bbb238aead0dbf7f380f4f9d10