Merge pull request #8677 from JosJuice/comma-operator Android/JNI: Remove odd usage of the comma operator