Merge "Revert "android_hook: fix leaking file descriptor"" am: 47cd2fdf03 am: 4d5a3b72f3
am: 0044998a75

Change-Id: I5b4db2f03f28e40849316a05b9a67b161278f7ae