Better consumption of AAR during APK build part 2.

Continued the work of William and added compatibility for apklib

https://github.com/jayway/maven-android-plugin/pull/254