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

Change-Id: If0f42949eed1f1b54d2a043d9f3be0506030a8dc


Trivial merge