(Android) platform_android - cleanups