Merge "Add media-linker-config to test media APEX"