do not override arm and thumb flags

Change-Id: I0718c15fbd6357504caaa27fecf841172142db4f