am bf28ab93: Merge "Assert dex-cache is populated following resolution in debug builds."

* commit 'bf28ab931c7cd01297ea036537f6679bcc2139b7':
  Assert dex-cache is populated following resolution in debug builds.