Merge "Revert "Enable compilation of secondary dex files""
am: e70cda6147

* commit 'e70cda6147e2e49384a219b167a6c734a8db28f5':
  Revert "Enable compilation of secondary dex files"