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

Change-Id: I3004ecf49b768501d65ca3a9620a624e391689fa


Trivial merge