Merge "Move SdkSetup.apk to vendor partition"
am: 2cf91f337c

Change-Id: I26ab29dda2efe61b2831d4a59062bd97c881218e