Merge "Revert^2 "Add vts_vndk_abi_test"" am: c97165b3ee

Change-Id: Ie0dbe5b798b9fdfc827341df7e5c8e95be851528