Merge "Fix cargo2android's license block preservation"