Merge "Fix nullpointer dereference in libnativeloader"