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
tree: a5ab5ad55a9d32232e1548e79e6a3b77c9b3ae68
  1. conf/
  2. include/
  3. src/
  4. Android.mk
  5. gen-buildcfg.sh
  6. vnd_buildcfg.mk