Merge "Remove direct dependency on art/tools/veridex/appcompat.sh"