Merge "Sort files in directories passed to jar" am: 966ed15a1d am: 604a2423b6 am: da54a77928 am: 18c92897a7
am: 4a18f97b9d

Change-Id: I08bcb8fca0a9318913ba21a1a17cfa02012ca370