Reason for revert: Should to be fixed now. Original issue's description: > CQ: Change Android trybots to not run device tests. > > BUG=chromium:588063 > TBR=phoglund@webrtc.org > > Committed: https://crrev.com/ecdeb4cb94d95a7b0819e0ff5e62f272a799f59c > Cr-Commit-Position: refs/heads/master@{#11679} TBR=phoglund@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:588063 Review URL: https://codereview.webrtc.org/1717713002 Cr-Commit-Position: refs/heads/master@{#11689}