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

* commit 'd961e65a3681ee37080aa1ca5b9bd91343c5f37e':
  Keep dex files live in class table