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

Change-Id: Ibf469562e5aee08459aad2088534124065576797