Merge "Add gradle 3.0 to prebuilts"
am: baf3bbc7a4

Change-Id: I8cfe2aad760267a5df63566a5a898e957ee95bed