Merge "ART: Collect instruction flags in a struct" am: 2f2824474e
am: 7689713363

Change-Id: I20030c9a19c561045ac24f158eea97764690dc89