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

Change-Id: If2253f69ac62d8e40cb8aacdb600024163fbef99