Android (Fragment): Deprecation cleanup

- Also fixed a regression that caused my fix to #912 to no longer work
- Minor Formatting