Merge "Adjust spacing before NOLINT comments in ART."
am: c17d21d442

Change-Id: Ic44e4396616b9f8e692b6c530553e9f98305e479