Merge "Sort dex and static lib resources"