am cf997049: Fix the Library sample.

Merge commit 'cf9970499bfcce80d92c2fe37fd552e586c177b6' into froyo-plus-aosp

* commit 'cf9970499bfcce80d92c2fe37fd552e586c177b6':
  Fix the Library sample.