Merge "Add libneuralnetworks_shim.so to requireLibs." am: d7fd9b715c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1675827

Change-Id: I74183f47c797788cf552737342a6c7fd04a8dda5