Merge "Add Flag for Enabling 64-bit Media DRM Server" into oc-dev
am: 2fdf283c82

Change-Id: I33908703a3af73f91fdd0e135c15cd7800bed39a