am 15474b9b: Update gradle build to reflect makefile dependencies.

* commit '15474b9b03ff93b60289d65e43f71155be1e508e':
  Update gradle build to reflect makefile dependencies.