Merge "Fix fd leak in android_dlopen_ext."
am: 5bccde719f

Change-Id: I83470e3b75beda4df3d87127d8b3f6f996e9bf86