Merge "Revert "android_hook: fix leaking file descriptor""