Merge "Revert "Add libneuralnetworks_shim.so to requireLibs."" into sc-dev