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

Change-Id: I522cb101e0dfbcd5a37b47a0f733a1e1aeddfc40