Merge "Refactor NNAPI VTS to remove unreasonable dependence between versions"