Merge "Hold dex caches live in class table" am: b6b05aef09
am: 7b07e4dd94

* commit '7b07e4dd94be8aab10b62f91eff0004bb6c348ee':
  Hold dex caches live in class table

Change-Id: I933f7898a9df83eee6022d27c9e6f3305253e826