Change-Id: Id1269f85ec2f522c8d4b0d05f84d050b42d70d60 Tested: on Android
Change-Id: I4c9f0f722490b374257adb3fec63e44ae93da920 Tested: using VS2010 / Xcode / gcc on Linux.