Merge "Add vts_vndk_abi_test" am: 814170658a am: 397c821e01

Change-Id: I51bc99ffd4a88fa403a7a6e7a72bdfdaef9c18c5