Merge "Sort inputs to compatibility suite zip files" am: 328290459d
am: a2b1052ae2

Change-Id: I89612f53a26d5f5f7ed08ffe8820080ae73810e7