am 2ad2455f: Merge change I86397f6c into eclair-mr2

Merge commit '2ad2455fcf8cea805b3824c9df1dfd37ae1bcf92' into eclair-mr2-plus-aosp

* commit '2ad2455fcf8cea805b3824c9df1dfd37ae1bcf92':
  moved the hidden sync helpers out of the framework