ubuntu-touch : media : Rebase from CM11 with my own changes