Partial update to android maven plugin 4