Merge "Fix target for library sample" into froyo