Review: Change NewApi suppressions back to @TargetApi