Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Don't crash on startup if we can't fetch the interface list.

Change-Id: Ia1c158ea77f71035b665282cdeaed619cbb461e3
tree: 94ebf4bc0b237fe778ee008c6b6b22f3d01e207c
  1. java/
  2. Android.mk