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

* commit '1bfa14572deadafc3d865bfaea1c02349067d52b':
  Keep dex files live in class table