Also added a safety check for buffers growing past 2 gigabytes. Change-Id: I2bca7159f606cf1c08c4391e88ef9b4c8363be06 Tested: With the Java sdk.
Change-Id: I4c9f0f722490b374257adb3fec63e44ae93da920 Tested: using VS2010 / Xcode / gcc on Linux.