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

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



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