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

Change-Id: I22118554f60130018dc4144e64d12492e674828b