am be428b4d: Merge "ART: Fix variable formatting and CodeLayout\'s multiple visits"

* commit 'be428b4da47339409aac0cfa153888c384dfaef7':
  ART: Fix variable formatting and CodeLayout's multiple visits