[automerger skipped] neuralnetworks: Update makefiles. am: e694cb2dad am: 7231bbe737
am: a5f3c58af7 -s ours
am skip reason: change_id I5fb6c126a090a3fe0fa4829ea9224564133dc1ae with SHA1 f8a47b7f01 is in history

Change-Id: I831d324b9d30a0624aa538fe0a8882dc8d201488