Merge "Merge "[automerger skipped] Support secondary arch for host module...

Merge "Merge "[automerger skipped] Support secondary arch for host module exports. am: 164451c1 -s ours am: 5a8a6bf7 -s ours" into rvc-d1-dev-plus-aosp am: 4503a465 -s ours" into rvc-qpr-dev-plus-aosp am: 814565de -s ours

am skip reason: Change-Id Iec4d8aa59a3ad55583c788f8ec40dd0637e7af33 with SHA-1 164451c1 is in history

Change-Id: I96e43697bf2b0d3ba0d93691ac350a5b9bec720e