Fixed last merge.
Also, updated Android Maven plug-in.
This is the last commit before version 2.0.

Signed-off-by: Paulo Pires <pjpires@gmail.com>