Merge "stagefright: use media timestamp for default render timestamp" into mnc-dev