Revert "Revert "AOSPA-21 Add media drm""

This reverts commit fbab40d540907d53fc2f59fde5a81c2016c5bc7d.
Fix media drm

Signed-off-by: Evan Anderson <evan@thelinuxman.us>