Merge pull request #202 from NiLuJe/master

Tweak Android *FLAGS
Merge remote-tracking branch 'upstream/master' into mxcb_wait_for