Merge "Move to C API of libnativeloader." am: a88a0fa389
am: 821b80c477

Change-Id: Ia331898d4e729558975335806a94289521c89be2