merged latest upstream patches from CM11 media-caf  repo