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

Change-Id: Ie19bc50da9abde9f15860a49a19cbc4607b02ba2