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

Change-Id: I3053a3f9cd1f90213b8a0e521fcabc383c34722b