Pin support libraries to Java 1.7 so they can be used with dx
am: e1cd5a1f80

* commit 'e1cd5a1f80010eece43cb4608505fd39f4832c00':
  Pin support libraries to Java 1.7 so they can be used with dx