Use media to build instead of media-caf...for now

Change-Id: I7ceca9f0016c97462b1c62c9db336aa931b4bb66