tenderloin:cherries.sh: change in cherry-pick

Change-Id: I425ed3d1e9f1cf5f71e4979bfee4ebf32d3555b1
Bad device files == no nightly!

Change-Id: I63a51f9410086f78e8d81bb9c326e888cb4e1ba5
Merge remote-tracking branch 'upstream/pac-4.4' into pac-4.4