Merge "Recognize odex files in memory accounting."