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

Change-Id: Id38c8952fe64a84212907d0c17acf05baf00e897