Merge "Revert^2 "Add vts_vndk_abi_test""