Merge "lock TestDeviceSetup to one SDK to allow running PTS for older systems" into jb-mr2-dev