DO NOT MERGE revert CTS integration build changes am: 62875f6b9f -s ours am: 38cac33...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:24:07 +0000 (17:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:24:07 +0000 (17:24 +0000)
am: 464564dd4a  -s ours

Change-Id: I1e1dbefc3c15c4b5d36874a35c26b4f72675191f


Trivial merge