DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:54:24 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:54:24 +0000 (19:54 +0000)
am: e16a66ead4  -s ours

* commit 'e16a66ead4f405ab3b32a79af7bb5ef1727d31cb':


Trivial merge