Merge "Move SdkSetup.apk to vendor partition"