Merge "ART: Correct static invariant checks"
am: 2a96120f0a

Change-Id: I45d088796ae13263a56919c6dced9851cdf8fa1b