Switched to AAR Library and Maven Repo