Merge "Continue using the legacy NDK android/log.h."