Merge "Disable GNU extensions in bspatch code."