Merge "fix build problem, when #define ENABLE_ANDROID_LOG 1"