am ca2327f1: Merge "Fix target for library sample" into froyo

Merge commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6' into froyo-plus-aosp

* commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6':
  Fix target for library sample