ndk: reverse course on android/log.h am: 5c967da341
am: 37e1ee432c

Change-Id: I2c08ee344bbfbb5c28d8a83173589633494c7c66