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

Change-Id: I3b14c8b2c2a057110ec0e88b91a4b9ba6bffe63d