Merge "Calculate audio media drift time from AudioSource" into gingerbread