Merge "ART: Fix some tidy warnings" am: 13e60fa0ac am: 4213e68fc0
am: 3025ee6b8d

Change-Id: I28abb608175ce86902244ff0164cd4cff24881cb