Merge "Revert "Move SdkSetup.apk to vendor partition"" am: e6964f00a8
am: b0ed71b318

Change-Id: Ibb3c1d00f1712644e580f5dbf6a8c382b9e8fada