Merge "Remove unused variable" am: 9c322946 am: f5c4a1a7 am: f13a3fa3...

Merge "Remove unused variable" am: 9c322946 am: f5c4a1a7 am: f13a3fa3 am: 931eebe8 am: c77c1352

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



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