Merge "Build 64-bit mediaserver on 64-bit-only"