Merge "Add Flag for Enabling 64-bit Media DRM Server" into oc-dev