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

Change-Id: I691573d6e7332ca8f010593e49f889054eb35b99