Merge "Fix debug macro" into tm-dev am: c3f06be6 am: 9f0c71f7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17823190



Change-Id: I98fce9f779e062cfc1f0d0dc37d422a639b16a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>