Merge "libvndksupport: do not use functions from android/dlext.h"