Merge "Fix use of native loader API."
am: 4706ff08bd

Change-Id: I052b8f89546984071a108842069da47fe44a9e83