Merge "libnativehelper is available to com.android.bluetooth.updatable"