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

Change-Id: I0bad79535b4603fc34937971163b24bac96f841d