Merge "libgsm's "gsm.h" is now C++-safe." am: 1aaaa4ea4a

Change-Id: Iaeb9033353d0880dc075d9242a37b3d1b54aef18