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

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



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