Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  make wifi_load_driver blocking

Change-Id: Ifc3dfbf161dbff2b1d6efd4be32d407db1af947b