Merge "Fix tools_r10: some emulator files moved to development.git" into tools_r10