Merge commit '544592e1' into froyo-plus-aosp * commit '544592e1': fix [2542425] memory leak during video recording