Merge "Use tradefed AbiUtils"
authorJulius D'souza <jdsouza@google.com>
Thu, 15 Sep 2016 17:16:46 +0000 (17:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 15 Sep 2016 17:16:46 +0000 (17:16 +0000)

Trivial merge