automerge: e5e43e9
* commit 'e5e43e9ab88bf6a9951a323ae5f804967dab4c96':
Teach bmgr that "android" is a valid package name
automerge: e5e43e9
* commit 'e5e43e9ab88bf6a9951a323ae5f804967dab4c96':
Teach bmgr that "android" is a valid package name