DO NOT MERGE revert CTS integration build changes am: 62875f6b9f -s ours
authorPyry Haulos <phaulos@google.com>
Wed, 27 Jul 2016 01:29:12 +0000 (01:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 01:29:12 +0000 (01:29 +0000)
am: 38cac339a5  -s ours

Change-Id: I129d3c7c230e9ab6f189fc1bdd6b165021fd420d


Trivial merge