Merge "frameworks/av: fix errors inside ALOGV"