Merge "Revert "Move SdkSetup.apk to vendor partition""