Update the listing for the buildbot now that it is all in-app
[Android] Clean up for things only being done halfway.

Changing from a collection to an array back to a collection was just
adding a lot of unnecessary overhead. This removes that pointless
process and adds the previous changes to the second activity for
handling controllers.