Android n-iot-release-smart-display (NIT1.180611.004)
Merge "Deprecate <cutils/log.h> and <utils/Log.h>"