Merge "Move all [device] failures to [device_testdex]." am: 604312a9ca
am: 3f66312fa5

Change-Id: Ie9a70358670c6d37ce32c5849edb8ba7ba1407cb