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

Change-Id: I087aa3338187a4f27894d8d2f79f933a840d3e71