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

Change-Id: Ic9462b04d94eebe767afcc1ed1879ca000563822