Merge "define LOG_TAG before including android/log.h"
am: 35dcc67558

Change-Id: Iefdfd1ea0703742ea37d27783c698bc154d30216