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

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