Merge "Convert external/libgsm to Android.bp"
am: c06febc81b

Change-Id: I131bea8be3c412034ae6d8fbe2018fde8d441172