Minor lint fixes and move to gradle 1.9