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

Change-Id: I22f709393fcbef2e3d44bd00a68330d2f215a844