Android n mr1 preview 2
Merge "define LOG_TAG before including android/log.h"