go back to aosp media for now

CAF media broke display for me. Will revisit later.