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

Change-Id: Iaccd65de387ae2419f4bd1f54ae98cd9edad6a2e
tree: 7d4d6ba3dee0f4aaa9b30e5c542526eb34771aa3
  1. Android.bp
  2. CleanSpec.mk
  3. src/