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

Change-Id: Iba547fc4ca6539cae2e028b1d58ecec657c9886f