Merge "Add libvndksupport-tests to TEST_MAPPING"