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

Change-Id: Ibd605708e11d5f95b50bb8432dff5aba5e8db1ef