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