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

Change-Id: I7687595555a899a2b979a60a7a711e9615a9310c