Merged OUYA and Android flags from main repo