Merge "Fix nullpointer dereference in libnativeloader" am: 724cbb080d
am: 77a2e830e7

Change-Id: I699e314a7a0c68dad3bd9a977862ce31a17af555