Merge changes Ifa8ebcd5,I25e0f431

* changes:
  Fix audio route selector.
  Fix crash on hanging up simulator video call.
tree: a7fb6b6ab287054cf1806ff1b75067fc0d79a438
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE