plugin android -> android-library
Merge remote-tracking branch 'origin/master'