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

Change-Id: Ie4f2b53bded112eb0934281c17c760999645fb94