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

Change-Id: Idf090f0f7cd7c7d88621dbb26a21b9ef44621e94