Merge "Revert "Add NeuralNetworks HAL v1.3"" am: f5f487be03 am: 176c4afae7
am: a163c720ed

Change-Id: I26387949793d5f834b69a97f23de12053251d360