Merge commit 'b72081966da3842e27f88045cfa5a67cef3d4220' into gingerbread-plus-aosp

* commit 'b72081966da3842e27f88045cfa5a67cef3d4220':
  Use audio clock as the reference media clock