Revert "media: Adjust for new header Android.bp requirements"

This reverts commit 15e38737f277b2fb29749aa02ec76303ff0341dc.

Change-Id: I55b5134d6bc2c6316af7de425472988282f742cb
3 files changed