Merge pull request #379 from bhariharan/unstable

Merge branch 'master' into unstable
More granular symlink rollback on postpublish
Merge pull request #380 from khawkins/less_invasive_postpublish

More granular symlink rollback on postpublish
Merge remote-tracking branch 'upstream/master' into unstable
Merge pull request #381 from khawkins/unstable

Android SDK: Merging master into unstable
PRNG fixes for Jellybean
Merge pull request #382 from bhariharan/master

PRNG fixes for Jellybean
Bumped up NPM Version
Merge pull request #383 from bhariharan/master

Bumped up NPM Version
Merge branch 'master' into unstable