Merge "ioctlent.sh: update the list of directories exported by headers_install"