Merge pull request #10409 from JosJuice/android-no-cplusplus-checks Android: Get rid of __cplusplus macro checks
