Switch to betterpickers aar from maven
Code reformating and imports cleanup.