fix android build for mini-sdk virsion issue
Merge pull request #569 from volvet/fix-android-build

fix android build for mini-sdk virsion issue
Merge remote-tracking branch 'upstream/master' into travis.android