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

Change-Id: Ic82efc31cee662b9381a6da6b49f5b40ebae7d30