Address "Various android workarounds" commit introduced in the 138 rebase

With the intent of keeping RR rebases moving, I have added a commit with improper fixes to some Android runtime issues found during testing of the 138 rebase (!1511 (34e6a8eb))

This ticket is for us to go back after the rebases are done are find proper fixes for these issues.

---