am 31fa14fd: Merge "Use the right instruction set for checking dex-cache staleness." into lmp-dev

* commit '31fa14fdbbccfcd9b50bc6db6aae6168b4fc2249':
  Use the right instruction set for checking dex-cache staleness.