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

Change-Id: I5c0e992dfc11ef2a84147db0329f1b68849382e3


Trivial merge