refactored into two libraries, added Gradle support and AAR artifacts
Merge remote-tracking branch 'upstream/master'