This reverts commit 408509efdc. Reason for revert: just kidding. We want to run the tests on old devices, too. Change-Id: I920fa825380638122f638e057bcfbe98b5f7b301
408509efdc