Merge "Update cuttlefish to use 1.3 NNAPI sample drivers"
am: cd99931502

Change-Id: Idb4fd77729aa6ceb31cfbfa6dfd98aa76e2d42fe