Merge "Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup."