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

Change-Id: I859456941f5355a016b9bc6c1669d23bed0c9ae0