Fix mustpass generation am: 8367ae87c7 am: 9bfa26ee16
authorChris Forbes <chrisforbes@google.com>
Tue, 19 Dec 2017 23:16:47 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Dec 2017 23:16:47 +0000 (23:16 +0000)
am: a2153a19c7

Change-Id: I0eeca331624e421d67ef67ad6b105016bb1dcd2c


Trivial merge