am f4c5d957: Merge "Fix volley related build breakage."

* commit 'f4c5d9578e248a8871f278880a38f8d71a68280c':
  Fix volley related build breakage.