Merge "Compile libbluetooth_jni.so only for current device architecture"
am: 59b94ab471

Change-Id: I848634b08f20966f46cf5b16340ca72f9b0307a2