Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  libbt conf file for google gce_x86 devices

Change-Id: Ifc1b0fd211c7616fea0baa5b5e4dafce044685b9