Tidied includes in android demo file