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

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