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

Change-Id: I6b9f9eccd7b39305ab5ffdf1879bed04374c2131