Build Aosp and GoogleContacts using Gradle
am: 687432da28

Change-Id: I825e1b915df5a0c1227af587eac88c652f7ed087