Merge branch 'release/v1'
Update AndroidHelperPlugin.gradle
CP update