[automerger skipped] Add vts_vndk_files_test am: a0805f0b0f am: ea547f5c6f -s ours am: 69d6462b55 -s ours

am skip reason: Change-Id I4e8ee887a80fdaafed61456fee02405a145df5d3 with SHA-1 d23ea91990 is in history

Change-Id: If8f201d3c91c7e2e9dc93ca7a0a3e2022f1cf70b