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

Change-Id: I0486e7567a58ab9e7ac873b90abbea938dd49eb3