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

Change-Id: I0611b42b0a5c211f5b0bc59d23d1dee2f4c7a7d9