am ab02e3b7: am b66781c5: Merge changes I3ef1ad8c,I0bbbba1a,Ife107fb6,Ia420b766

* commit 'ab02e3b7315815dae27ace117a817c91e3e04ad1':
  Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
  Move dex utilities from dalvik/dx to libcore/dex
  Mechanical refactoring of dx into two parts.
  Change com.android.dx.io.Annotation to use EncodedValue