Merge "add newest gradle plugin" into oc-dev
am: 4c50e07040

Change-Id: I6a5a58c62bffe3048726b91f4ab15d8e922c935c