Merge "Revert "reference-ril: fix emulator gateway"" am: fe21a1c2d8
am: bf10103224

Change-Id: Ic06fb7d7174dbb992bfa0dd2285ebccd1d34a8a4