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

Change-Id: Id8cf37817462359131caaa6ddd786323b8218771