Merge "Export variable for device sanitize arch to Soong" am: d778640b0f
am: 81e759e842

Change-Id: I31e391e46e407359ea3c1dc4875839d0c38b2b6c