Merge "Fixed repeating alarm's gradle 1.6 dependency, updated to use new build.gradle file format." into developers-dev