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

Change-Id: I09f2c99e86e92b68129fe31715461e030a5c73f4