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

Merge commit '33c1d23b012e9351667c85b2769b838a7f12b727' into kraken

* commit '33c1d23b012e9351667c85b2769b838a7f12b727':
  Fix target for library sample