Merge "msm: vidc: Return timestamps correctly back to the client" into msm-3.4