Merge "Remove ununsed #include." am: 62eef9adb8 am: 34a6953ffd am: 98749a0c37

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

Change-Id: I8071577e8cac4110a64f8b6fae19373344689340