am 9ab926b5: Merge "Update android generator to handle java7."

* commit '9ab926b5f7566d8e5cabc73cb69fdc214736e1bd':
  Update android generator to handle java7.