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

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

Change-Id: I6f1868705eab25d4c893093142798c6c84da41d9