Merge "Continue using the legacy NDK android/log.h." am: 14a7725f26 am: bcad2a684e
am: 0f2059b26f

Change-Id: I358df86fdfe203e0bb54e3e228019a0004d5975e