Merge "Update gradle to support AS 0.8 beta"