Android: Merged both Activity super classes

This is a left over from DPv1.