am 28a15a92: Merge "Keep dex files live in class table"

* commit '28a15a922e172f96018ab2a1e94ea1cfeb9b7b95':
  Keep dex files live in class table