Merge "Add presubmit tests to NNAPI -- hardware/interfaces/neuralnetworks" am: 80ad3f8449
am: 6e9f3462c5

Change-Id: I0f5a12f2884c94bae6ade5f703b4bc23ec551599