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

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



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