Merge "Upgrade libgsm to 1.0.18" am: f2041b96dc
am: 1fce22af50

Change-Id: I175fe49c3f48e73372b94017a0bc408654a81c60