Merge "Emulator: set correct rild library path for 64bit arch"