Merge "Fix build.gradle file"
am: e0039d8613

Change-Id: Ib1f4f170c8f939c390c22b9766e720d6e94d9bc7