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

Change-Id: Iaeb9033353d0880dc075d9242a37b3d1b54aef18
tree: c44e55ad4a62557f3266409a68042c507c66127b
  1. src/
  2. Android.bp
  3. CleanSpec.mk