Upgrade to support compatibility v4 19.0.1
General build clean up.
Robolectric requires the project be built with Jellybean