Merge "frameworks/base: fix errors inside ALOGV"