Merge "media: Add more debug information to help timestamp debugging." into oc-dr1-dev am: 1a0af2f643
am: b98aa771dc

Change-Id: If4024462ee7da2939d70eca9c293132eb3cc59f7