update fugu binaries, added shamu
Merge remote-tracking branch 'origin/lollipop' into lollipop