The SdkSetup apk is included by AOSP images and it should not refers to google apks. We need to figure out different way to fix the original GTS failure. BUG: 62292257 This reverts commit fb743d8db6e755e98251e6509a09aed6d51f76d4. (cherry picked from commit 03f4e91d52fbd994e0c11ddf537ad767e8c14bde) Change-Id: I87c4dcefc6b51890d4edcd2749eee2fbdb7fc8a0