Merge "Reorganize some of the stagefright implementation related to metadata."