Changes for Android + other platform stubs