Merge "Add  MediaMuxer APIs to light grey." into pi-dev am: cbe39d1a56
am: c657c961dc

Change-Id: I4c5c09cf7d24770444a379e8f5b109ff3506220d