Merge "Fix android_dlwarning lookup"