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