Add android aliases

Clean up some old duplicates