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

Change-Id: Iacc50444162e7164706c0741a8e7d73581e43008