Merge "[veridex] Add a --target-sdk-version to avoid false positives." am: 981d59093d
am: ea3f5d62ef

Change-Id: Id0c5f0957fd5842d5d1ebc0396d91ed36d41797f