am e88c0d9e: Merge "Recognize odex files in memory accounting."

* commit 'e88c0d9ec374ec4dcca6ccd8d440610ea83622c9':
  Recognize odex files in memory accounting.