Bug 840128 - Android client for Bagheera (v2)

Supersedes #299.