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