am b9386ed9: Merge change Ic9e65818 into eclair-mr2

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

* commit 'b9386ed929b72308cbfc68d2833a13aeda38f431':
  Attempt to fix the build server build: make the common library