(Android) Change core output naming conventions - same as other
platforms now