Merge "64-bit file size/offset support for DRM framework"