Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp * commit '7ed7668b30e70ca8e3f0f183364433326ed29f39': Calculate audio media drift time from AudioSource
Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp * commit '7ed7668b30e70ca8e3f0f183364433326ed29f39': Calculate audio media drift time from AudioSource