Fix clang launch control builds am: 2011fb57b8 am: c91abc37d2 am: 5801dce433 am:...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:37:36 +0000 (17:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:37:36 +0000 (17:37 +0000)
am: 7707290337

Change-Id: I46be67979e5188b03797e4b051796308645ae3cc


Trivial merge