Merge "Move to C API of libnativeloader." am: 9bc4066ba3
am: 634d1e1f10

Change-Id: Ib4a7f29db59cb934f16bba7a5c9f36eaf68ff02a