Merge "libnativehelper is available to com.android.bluetooth.updatable" am: 3827af8bf7 am: 4cfdb54e20

Change-Id: Icbe5c05e560e288b4d1e9558ef81ddc94a2be8db