Resubmit r8929 with the duplicated change in trunk/platform_tools/android

Unreviewed.
(SkipBuildbotRuns)

Review URL: https://codereview.chromium.org/14652007

git-svn-id: http://skia.googlecode.com/svn/trunk@8930 2bbb7eff-a529-9590-31e7-b0007b416f81
1 file changed