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

Change-Id: I906f036aad54ad2c860d9bcc463ddce78b0ec944