Merge "ART: Split out old instruction flags"
am: f6730e3383

Change-Id: I6f736426cbcaebda7f55f13936adc258571caaed