Fix defines for moto variants of media and display-caf

Change-Id: I47f6434c2ac2208b7ee3472f92062fd8dc544a1d