Merge "Integrate NNAPI unit tests into CTS" into oc-mr1-dev am: bb9e209f86
am: 03136da05d

Change-Id: Ia67dd2450f6570f4c527df946e06336328d28744