Merge changes I580e3f1d,I8e271982

* changes:
  android.hardware.bluetooth@1.0-impl: Updated to vendor_available:true
  android.hardware.bluetooth@1.0-impl: Updated Android.bp