am 1f816cf5: Merge change I362bebd3 into eclair-mr2

Merge commit '1f816cf57b93654638989e6007d669c04b3d9b88' into eclair-mr2-plus-aosp

* commit '1f816cf57b93654638989e6007d669c04b3d9b88':
  Include the common source files directly in the framework library