Merge "more complete 64bit mediaserver build targets"