Merge "Move LOG_TAG #define into .mk file"