Merge changes from topics "presubmit-am-ccc6c143101b468f83145a298c1082f9", "presubmit-am-d0ebefcda3024c72ada77080939a22c1" into tm-dev

* changes:
  Optimize primary and secondary dex’es together.
  Use an ordered list for optimizable packages.