Restore infinite loop tests into the mustpass am: 39f0e4a6ee
authorKalle Raita <kraita@google.com>
Fri, 28 Apr 2017 22:06:22 +0000 (22:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 22:06:22 +0000 (22:06 +0000)
am: 297d0b5cf1  -s ours

Change-Id: Ibcc1fe4e1cd3972c78021154ae89bdda05608f1e


Trivial merge