Revert "AndroidProducts: this is how it should be, not the other way around"

Ermagherd!!!

This reverts commit d9ea01c1a13fc5eb0896b0cf231159a18572210a.

Change-Id: Ie654b506ac5784ae0dca73fff2f7b7369b02282e