Merge "Support dynamic 64-bit drmserver"