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

Change-Id: I6581b9976e99cf2fbdc2d4d9a72621e9e1aee10e
tree: 09e8e6b1a627e1748be4ce1a8fdbecdaa2969a61
  1. Android.bp
  2. CleanSpec.mk
  3. src/