Merge "Delete unused parts of sdk" into emu-2.3-release