Revert "Android: Add separate controller item for android."

Change 336f9c52237e7d9f97c18d2a464aacc48ab62804 (Fix
QWindowControllerItem::geometryChanged()) made the same modification,
this should work for Android as well.

This reverts commit e849a5de6046ccaf2e76e636d640ec322ed87f45.

Change-Id: I9f277a356aca019fd33bb6c092d3b342c94bc64a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>