media fix-ups for Lollipop/AOSP.