Merge pull request #611 from bhariharan/unstable

Merge branch 'master' into unstable
Latest shared
Merge from upstream
Merge branch 'unstable' of github.com:forcedotcom/SalesforceMobileSDK-Android into unstable
Latest shared
Merge pull request #612 from wmathurin/unstable

Latest shared
Symlinks updates
Merge pull request #613 from khawkins/update_symlinks

Symlinks updates
Padding not needed
Merge pull request #614 from wmathurin/unstable

Padding not needed
Latest shared
Merge pull request #615 from wmathurin/unstable

Latest shared
Disallowing removal of accounts from the Settings app
Merge pull request #616 from bhariharan/master

Disallowing removal of accounts from the Settings app
Removing AccountWatcher
Merge pull request #617 from bhariharan/master

Removing AccountWatcher
Merge branch 'master' into unstable