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

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

Change-Id: Ia0753d55f41d4c91cf72505b0aabe1aac01c7089