Merge pull request #8503 from JosJuice/android-stick-calibration Android: Use square stick calibration
