Update the module to use the latest Android SDK stuff (1.6.0). This does not include a complete update of the API, just the new SDK bits, and an upgrade to Trigger 2.2.3 from 2.0.3.
Merge iOS and Android changes.
Resolve merge conflicts.