Refactor NNAPI VTS to remove unreasonable dependence between versions am: 73ee79dafa am: bc50034109
am: 92cc89a00e

Change-Id: If3615d73187bae25c729113bba8b40d457c9bd83