Merge part of Sisinda work on Android branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/Android@1805588 13f79535-47bb-0310-9956-ffa450edef68
7 files changed