libstagefright: merge libstagefright commits from CM repo