Merge "Revert "Continue using the legacy NDK android/log.h.""
am: 33aa9fc0e1

Change-Id: I3503c798091849462ac68fae662bbf61eed2a799