Merge "Sort dex and static lib resources" am: 67d993fc9c
am: aa725f6769

* commit 'aa725f6769d546e1cfeab59ca0dff15736fbc152':
  Sort dex and static lib resources