Merge "Cleaning up the serialization change. Renaming the define to be more in line with what it does and removing the host stub header file."