Merge pull request #11376 from JosJuice/android-delete-local-ref Android: Make more meticulous use of DeleteLocalRef