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

Change-Id: I7d1dcc76a8ec0d25b05878383917257e7ec718c9