[r1763] attempting to fix the build issues by changing the order in which classes are copied and merged
[r1763] attempting to fix the build issues by changing the order in which classes are copied and merged

Jonathan727/javarosa,Jonathan727/javarosa,Jonathan727/javarosa