Merge "ART: Move overflow gap definition to art.go" am: 7ab6240d59 am: 40baff49d7
am: 7f0b6baee3

Change-Id: Ic77fca026eeb63d412636585b2265524f02c9751