Merge "Fix ndk-gdb.py for debugging applications on x86_64"