Merge "Remove unnecessary shared_lib for neuralnetworks"
am: e57f17f4b0

Change-Id: Id2f1dceba3a218db98c3b1c6fc5dd983f962e308