Merge pull request #12316 from JosJuice/android-less-host-thread-lock Android: Remove HostThreadLocks that are no longer needed
