Merge "Sort files in directories passed to jar" am: 966ed15a1d
am: 604a2423b6

Change-Id: Ib149ee2190cc94af3e9f9934e2aaa23029c3222a