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