Merge "ART: Fix or disable some tidy warnings."
am: 8375e4f918

Change-Id: Id9d37ef0c1a8c7413c7f0f99f9e944d8c64140b3