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

Change-Id: I12526870d123ccb34d65d63899268d843734b87d