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

Change-Id: Ica45e63c53bbfa9f10c3308469f8fe5af13bcaf1