ee1bd86d9c
This reverts commit 80ddeb281a0d4b3d9a6d39a7ef91370f52845b39. breaks Android build and causes valgrind failures in the examples Change-Id: Ie13ceed2f9f8970af87339b807032a52083f27fe