Merge commit '966fcb81' into froyo-plus-aosp * commit '966fcb81': Revert "fix [2542425] memory leak during video recording"