am b99c469e: Merge change I3a62e1c2 into eclair-mr2

Merge commit 'b99c469e2bb96420ee3c57b351aa23dd4322852a' into eclair-mr2-plus-aosp

* commit 'b99c469e2bb96420ee3c57b351aa23dd4322852a':
  Solve the mutual interdependency problem between common and framework: