Merge "Bump tools version to 25.1.7 for emulator 2.0 release" into emu-2.0-release