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

Change-Id: Idb22117ce38243f5fc49ec0c51017b1570df126c