Merge "ld.config for com.android.neuralnetworks APEX." am: 2f40aa0f60
am: d91345d64c

Change-Id: I4d0da2ec61249b6cb0f6a3b3d37f1047c444d43c