Merge "Revert "Update cuttlefish to use 1.3 NNAPI sample drivers""