Merge "Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing" into oc-dev am: 8631fd7b27
am: 360abaf9d7

Change-Id: Ib7dfcf5b854219276246bd6129bf2a0311990bde