Merge "Revert "Update cuttlefish to use 1.3 NNAPI sample drivers""
am: 19515c51aa

Change-Id: I81499e390220470c848dab669249cbc0bad5bd3c