Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which...
authorXin Li <delphij@google.com>
Wed, 28 Dec 2016 21:02:54 +0000 (21:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 21:02:54 +0000 (21:02 +0000)
am: 2c3475cb3a

Change-Id: Ibf708e815fc010886c885e1e3af620986b210a3a

1  2 
android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java