Merge "Enable compilation of secondary dex files"
am: fb8932eec4

* commit 'fb8932eec4c09c34dfe759ba151e751293245c0d':
  Enable compilation of secondary dex files