GPII-1021: Updating code to make it compatible with work on GPII-941

The solution registry now takes common terms in the "real" flat format.
Updated android's solution registry according to it.
Also, updated remaining stuff.