Android (Fragment): Deprecation cleanup

Also fixed a regression that caused my fix to #912 to no longer work
Merge pull request #1329 from Unkn0wn0ne/fragment-cleanup

Android (Fragment): Deprecation cleanup