Merge "Support multiple arch for coverage packaging."
am: 56b5030eac

Change-Id: I5416d4c322db764662c97876c12e098a615af8a3