Android O IOT Preview 5 (OIR1.170720.015)
Merge changes I65063e1f,I9090720f

* changes:
  Update libgsm to patchlevel 17.
  Update libgsm to patchlevel 16.