Hopefully fix media related borked builds: grouper, mako dlx, moto msm, tf700,

Change-Id: I104a72f0d2c82e0543895543c218702c914644c2