Merge "[automerger skipped] Merge "Move to C API of libnativeloader." am: 9bc4066ba3 am: 634d1e1f10 am: 502998c860 -s ours am skip reason: change_id Ia2ba3e4ed69d35310838ed57e03dfc122c3579db with SHA1 42b30e7a2f is in history"