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

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

Change-Id: I32671d6c81abfe709ee04524e7c636c9803932b5