Bring in Stk and MediaProvider credit caf and @cyanogenmod