building plugin on Android
Merge pull request #1004 from emannion/android_plugin

building plugin on Android
Merge remote-tracking branch 'upstream/master' into travis.android