Merge changes I3641b7c0,Ibdd1dbc8 into froyo

* changes:
  Project-lib sample: define lib activity.
  Switch from codename Froyo to API 8.