Merge "Move to C API of libnativeloader." am: c9a388a147
am: 7f0a185f82

Change-Id: I4ff8270af27825d2ecd9c23e272c7f717b167627