Updating for Maven 3.1.1 and some fixes for the Maven Android Plugin

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-testing/trunk@1531346 13f79535-47bb-0310-9956-ffa450edef68