Merge "Expose patch reader for consumption" am: 952ddd532b am: 7b331f19d9 am: e88872597b

Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1535865

Change-Id: I3abeec795a25ec1579d5a19f26b9db94c0579474

bspatch.cc

@@ -33,8 +33,8 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>