Merge "Move SdkSetup app into device/generic/goldfish"