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

Change-Id: Ic4ff1df004dfedf338df94df41413c27cbbfa0db