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

* commit '92f3e9a1fba2873c00d1d89179c051a82e924d76':
  Recognize odex files in memory accounting.