Merge "Improve ALOGV compatiblity with clang-tidy" am: 854eb6cf78
am: 1e45dfdb47

Change-Id: I60ed32e902eca0ead86c69239d85b59949820c32