Merge "Remove extra newline in AndroidManifest."