Added some changes to AndroidPlatformStrategy.