Merge "Make ApiLint's new_since arg the merged txt file"