Merge "Remove extra newline in AndroidManifest."
am: 8aeb69396d

Change-Id: I36ea57db56ff985da118fb7ab117bf939b7b2dc1