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

Change-Id: I2db0acaf96f80e3bdce265d227a314d2775f1ce7