Adds more robust message package detection from PR #13

Upgrades Android plugin version as done in PR #13