Fixed final issues with source files coming from other src set
Fixed final issues with source files coming from other src set

dimagi/commcare-core,dimagi/commcare,dimagi/javarosa,dimagi/javarosa,dimagi/commcare,dimagi/javarosa,dimagi/commcare-core,dimagi/commcare-core,dimagi/commcare