move to 2.2-beta2 and local gradle3 prebuilt am: 3460270873
am: bec405c8d0

Change-Id: I7ce938f26092caf14f3f4c46a8fdc8e24310f430