Fix clang launch control builds
authorPyry Haulos <phaulos@google.com>
Wed, 10 Aug 2016 17:24:39 +0000 (17:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 17:24:39 +0000 (17:24 +0000)
am: 2011fb57b8

Change-Id: I86358b9457e21ae65115b7b5edfbd5883c845512


Trivial merge