Merge "Use the right instruction set for checking dex-cache staleness."