Moved to android gradle plugin 0.5.+

Change-Id: I6992d1446c557df2b462db9dc91fd47b3beacba8