Merge changes I65bfc24a,I0b25a097

* changes:
  Remove libutils from libbluetooth_jni
  Remove ability to change libbluetooth.so path