Merge "Fix 'adb shell /system/bin/linker' crash"