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

Change-Id: I88c8b84a400df2ed20e4e2017309634d8a725af4