more reorganization
Move diff-related code to a non-Android java library project