Merge "Remove unnecessary shared_lib for neuralnetworks" am: e57f17f4b0
am: 57589c52ad

Change-Id: I33a5dccaa0c77b0d0babcad11f2ae68d5fd969f4