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

Change-Id: I4c19de8b2d0067b302d762eb1e92e591deef0630