GitLab

Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I42752d163bebe841d21f5feb8909a9e5017d74d1