Update Android and OUYA Activity templates to work with these changes.