Merge "stagefright: metadata retriever changes for capture fps"