Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Update the Connectivity debug app to the multinetwork API.
  Update build tools rev to <API>.0.2. DO NOT MERGE.
  Fix llvm-rs-cc.exe crash for windows
  Update system images to revision 4

Change-Id: Ie1d2d478b1e36a32ee32d5a77365f6cb9e726d8e